Bug 598881 - Unimplemented GdkWindowImplIface methods crash gimp on OSX

Add dummy for _gdk_input_window_crossing ().  Set both input_window_destroy
and input_window_crossing pointers in the Impl struct.

Reported by John Ralls.

diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c
index 657d43590b27f8ec8ab0a393f7a642fe56a7bd7c..ea6cdca1e905a3b5e5bfca9b3603d7a37c46a441 100644 (file)
--- a/gdk/quartz/gdkinput.c
+++ b/gdk/quartz/gdkinput.c
@@ -385,3 +385,9 @@ gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble *
   
   return FALSE;
 }
+
+void
+_gdk_input_window_crossing (GdkWindow *window,
+                            gboolean   enter)
+{
+}

diff --git a/gdk/quartz/gdkinputprivate.h b/gdk/quartz/gdkinputprivate.h
index 5ec4ee99b50cb35a4bca9342a310f973c60f3cd1..b8f13ac38a573b7c849907b8c923bc5ee48c6075 100644 (file)
--- a/gdk/quartz/gdkinputprivate.h
+++ b/gdk/quartz/gdkinputprivate.h
@@ -147,6 +147,9 @@ gint               _gdk_input_disable_window (GdkWindow        *window,
                                              GdkDevicePrivate *gdkdev);
 void               _gdk_init_input_core      (void);
 
+void               _gdk_input_window_crossing (GdkWindow       *window,
+                                               gboolean         enter);
+
 void _gdk_input_exit           (void);
 
 #endif /* __GDK_INPUTPRIVATE_H__ */

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 476449834091d7d69254bbd6b9267d8ed97c53a1..24057b50eb04adcef5987ec47b66b0e2ce475f93 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -25,6 +25,7 @@
 #include "gdk.h"
 #include "gdkwindowimpl.h"
 #include "gdkprivate-quartz.h"
+#include "gdkinputprivate.h"
 
 static gpointer parent_class;
 
@@ -3035,4 +3036,6 @@ gdk_window_impl_iface_init (GdkWindowImplIface *iface)
   iface->queue_antiexpose = _gdk_quartz_window_queue_antiexpose;
   iface->queue_translation = _gdk_quartz_window_queue_translation;
   iface->destroy = _gdk_quartz_window_destroy;
+  iface->input_window_destroy = _gdk_input_window_destroy;
+  iface->input_window_crossing = _gdk_input_window_crossing;
 }